8bf55ed4be74025c12f2d63e18366b9855bcb175,cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/documentstore/DatabaseImplConflictsTest.java,DatabaseImplConflictsTest,getConflictedDocumentIds_oneConflictWithTwoConflictedLeafs,#,45

Before Change


        DocumentRevision rev = this.createDocumentRevision("Tom");
        InternalDocumentRevision newRev = this.createDetachedDocumentRevision(rev.getId(), "1-rev", "Jerry");
        this.datastore.forceInsert(newRev, "1-rev");
        Iterator<String> iterator = this.datastore.getConflictedIds();
        List<String> conflictedDocId = CollectionUtils.newArrayList(iterator);
        Assert.assertThat(conflictedDocId, hasSize(1));
        Assert.assertThat(conflictedDocId, hasItems(rev.getId()));

After Change


        DocumentRevision rev = this.createDocumentRevision("Tom");
        InternalDocumentRevision newRev = this.createDetachedDocumentRevision(rev.getId(), "1-rev", "Jerry");
        this.datastore.forceInsert(newRev, "1-rev");
        Iterator<String> iterator = this.datastore.getConflictedIds().iterator();
        List<String> conflictedDocId = CollectionUtils.newArrayList(iterator);
        Assert.assertThat(conflictedDocId, hasSize(1));
        Assert.assertThat(conflictedDocId, hasItems(rev.getId()));